New upstream release

Closes: #1004467

diff --git a/debian/changelog b/debian/changelog
index 96dacd4f367a9f47f8e08780b1f88eef04949894..f4758c371578617924ea7a6e99f92ffc32eef971 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ostree (2022.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Updated libglnx submodule fixes an incompatibility with eCryptFS
+      (Closes: #1004467)
+  * Install new script /usr/libexec/libostree/s390x-se-luks-gencpio
+    into ostree-boot
+  * d/p/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch:
+    Add patch to retain compatibility with non-/usr-merged systems
+  * d/libostree-1-1.symbols: Update
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 07 Mar 2022 19:16:49 +0000
+
 ostree (2022.1-3) unstable; urgency=medium
 
   * Use debhelper 11 features instead of dh-exec

diff --git a/debian/libostree-1-1.symbols b/debian/libostree-1-1.symbols
index 9a3c278ce9ba3f276e3436e68b1e27bb0082edea..0f7a44110289aaa5e8ffb059bc506e63eb9436bc 100644 (file)
--- a/debian/libostree-1-1.symbols
+++ b/debian/libostree-1-1.symbols
@@ -41,6 +41,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  LIBOSTREE_2021.3@LIBOSTREE_2021.3 2021.3
  LIBOSTREE_2021.4@LIBOSTREE_2021.4 2021.4
  LIBOSTREE_2021.5@LIBOSTREE_2021.5 2021.5
+ LIBOSTREE_2022.2@LIBOSTREE_2022.2 2022.2
  ostree_async_progress_copy_state@LIBOSTREE_2019.6 2019.6
  ostree_async_progress_finish@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_get@LIBOSTREE_2017.6 2017.6
@@ -381,6 +382,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  ostree_repo_traverse_commit@LIBOSTREE_2016.3 2016.4
  ostree_repo_traverse_commit_union@LIBOSTREE_2016.3 2016.4
  ostree_repo_traverse_commit_union_with_parents@LIBOSTREE_2018.5 2018.5
+ ostree_repo_traverse_commit_with_flags@LIBOSTREE_2022.2 2022.2
  ostree_repo_traverse_new_parents@LIBOSTREE_2018.5 2018.5
  ostree_repo_traverse_new_reachable@LIBOSTREE_2016.3 2016.4
  ostree_repo_traverse_parents_get_commits@LIBOSTREE_2018.5 2018.5

diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install
index 67b8681f1811f89c1b60ad8d1115f8bd239199c0..f19b664489c4ee738c1437841aeb0df490d4676d 100644 (file)
--- a/debian/ostree-boot.install
+++ b/debian/ostree-boot.install
@@ -10,3 +10,4 @@ usr/lib/ostree/ostree-prepare-root
 usr/lib/ostree/ostree-remount
 usr/lib/tmpfiles.d/ostree-tmpfiles.conf
 usr/libexec/libostree/grub2-15_ostree
+usr/libexec/libostree/s390x-se-luks-gencpio

diff --git a/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch b/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch
new file mode 100644 (file)
index 0000000..24f55a2
--- /dev/null
+++ b/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch
@@ -0,0 +1,22 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Mon, 7 Mar 2022 19:23:09 +0000
+Subject: s390x-se-luks-gencpio: Use interoperable path for bash
+
+On OSs that do not consistently merge /usr/bin with /bin, the path to
+bash has traditionally been /bin/bash.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ src/libostree/s390x-se-luks-gencpio | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio
+index f0ad24e..a62d43e 100755
+--- a/src/libostree/s390x-se-luks-gencpio
++++ b/src/libostree/s390x-se-luks-gencpio
+@@ -1,4 +1,4 @@
+- #!/usr/bin/bash
++ #!/bin/bash
+  # This script creates new initramdisk with LUKS config within
+ set -euo pipefail
+ 

diff --git a/debian/patches/series b/debian/patches/series
index b73e566a722cdb595a2da78c1c1ef5f43703efb2..5b5add2d0d17729764a570512dc0e1d75b837e06 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian/Skip-test-pull-repeated-during-CI.patch
+s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch